.merchandise{
    width: 95%;
    /*background-color: #00b3ee;*/
    margin: 30px auto;
    height: 800px;
}
.me_search{
    width: 300px;
    /*background-color: silver;*/
    height: 50px;
    margin-left: 6.5%;
    float: left;
    margin-top: 25px;
}
.me_input{
    height: 45px;
    width: 280px;
    padding-top: 2%;
    padding-left: 2%;
    /* border: 1px solid black; */
    font-size: 16px;
    padding-bottom: 2%;
    margin-left: 3%;
    outline: none;
    border: 1px solid #cdcbcb;
}
.btn_search{
    cursor: pointer;
    width: 85px;
    height: 44px;
    margin-top: 25px;
    line-height: 44px;
    float: left;
    text-align: center;
}
.btn_search>p{
    font-weight: bold;
    color: white;
}
.btn_search>input{
    width: 100%;
    height: 100%;
    background-color: #009688;
    border: none;
    outline-style: none;
}
<<<<<<< HEAD
/*.aaaa{*/
/*    position: relative;*/
/*    top: -30px;*/
/*    left: 80px;*/
/*    height: 30px;*/
/*    width: 250px;*/
/*}*/
=======
/*编辑*/
.com-edit{
    background-color: #00b3ee;
    width: 70px;
    text-align: center;
    border-radius: 6px;
    color: white;
    font-weight: bold;
    cursor: pointer;
}
/*删除*/
.con-delete{
    background-color: #ee6669;
    width: 70px;
    text-align: center;
    border-radius: 6px;
}
/*店铺商品信息--查看样式*/
.bus-see{
    background-color: #009688;
    width: 70px;
    text-align: center;
    border-radius: 6px;
    color: white;
    font-weight: bold;
    cursor: pointer;
}
>>>>>>> 08eb8af4f0dd32cffd193aebfdef9551d4abfa2f
